From 0db243fc8111bb5aec8870685ecb73466586f4a5 Mon Sep 17 00:00:00 2001 From: Leopold Palomo-Avellaneda Date: Mon, 6 Oct 2014 17:29:17 +0200 Subject: [PATCH] Adapting for 1.7.2 and solving Multi-Arch things --- debian/control | 56 +++++++++++++++++------------ debian/libpcl-doc.lintian-overrides | 2 +- debian/rules | 9 +++-- 3 files changed, 42 insertions(+), 25 deletions(-) diff --git a/debian/control b/debian/control index d18f5149..e5a96d5f 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 9), dh-exec (>=0.3), libqt4-opengl-dev, libusb-1.0-0-dev, libvtk5-qt4-dev -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/pcl.git Vcs-Git: git://anonscm.debian.org/debian-science/packages/pcl.git Homepage: http://www.pointclouds.org/ @@ -55,6 +55,7 @@ Description: Point Cloud Library - development files Package: libpcl1.7 Architecture: any Multi-Arch: foreign +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, libpcl-apps1.7, libpcl-common1.7, @@ -101,9 +102,9 @@ Description: Point Cloud Library - debugging symbols Package: libpcl-common1.7 Architecture: any Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Pre-Depends: ${misc:Pre-Depends} Description: Point Cloud Library - common library The Point Cloud Library (PCL) is a standalone, large scale, open project for 2D/3D image and point cloud processing. @@ -116,7 +117,9 @@ Description: Point Cloud Library - common library Package: libpcl-apps1.7 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends} Description: Point Cloud Library - apps library The PCL framework contains numerous state-of-the art algorithms including filtering, feature estimation, surface reconstruction, registration, model @@ -128,9 +131,9 @@ Description: Point Cloud Library - apps library Package: libpcl-features1.7 Architecture: any Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Pre-Depends: ${misc:Pre-Depends} Description: Point Cloud Library - features library The Point Cloud Library (PCL) is a standalone, large scale, open project for 2D/3D image and point cloud processing. @@ -144,9 +147,9 @@ Description: Point Cloud Library - features library Package: libpcl-filters1.7 Architecture: any Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Pre-Depends: ${misc:Pre-Depends} Description: Point Cloud Library - filters library The Point Cloud Library (PCL) is a standalone, large scale, open project for 2D/3D image and point cloud processing. @@ -160,9 +163,9 @@ Description: Point Cloud Library - filters library Package: libpcl-io1.7 Architecture: any Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Pre-Depends: ${misc:Pre-Depends} Description: Point Cloud Library - I/O library The Point Cloud Library (PCL) is a standalone, large scale, open project for 2D/3D image and point cloud processing. @@ -177,9 +180,9 @@ Description: Point Cloud Library - I/O library Package: libpcl-kdtree1.7 Architecture: any Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Pre-Depends: ${misc:Pre-Depends} Description: Point Cloud Library - kdtree library The Point Cloud Library (PCL) is a standalone, large scale, open project for 2D/3D image and point cloud processing. @@ -193,9 +196,9 @@ Description: Point Cloud Library - kdtree library Package: libpcl-keypoints1.7 Architecture: any Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Pre-Depends: ${misc:Pre-Depends} Description: Point Cloud Library - keypoints library The Point Cloud Library (PCL) is a standalone, large scale, open project for 2D/3D image and point cloud processing. @@ -209,9 +212,9 @@ Description: Point Cloud Library - keypoints library Package: libpcl-octree1.7 Architecture: any Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Pre-Depends: ${misc:Pre-Depends} Description: Point Cloud Library - octree library The Point Cloud Library (PCL) is a standalone, large scale, open project for 2D/3D image and point cloud processing. @@ -225,9 +228,9 @@ Description: Point Cloud Library - octree library Package: libpcl-registration1.7 Architecture: any Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Pre-Depends: ${misc:Pre-Depends} Description: Point Cloud Library - registration library The Point Cloud Library (PCL) is a standalone, large scale, open project for 2D/3D image and point cloud processing. @@ -241,9 +244,9 @@ Description: Point Cloud Library - registration library Package: libpcl-sample-consensus1.7 Architecture: any Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Pre-Depends: ${misc:Pre-Depends} Description: Point Cloud Library - sample consensus library The Point Cloud Library (PCL) is a standalone, large scale, open project for 2D/3D image and point cloud processing. @@ -257,9 +260,9 @@ Description: Point Cloud Library - sample consensus library Package: libpcl-search1.7 Architecture: any Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Pre-Depends: ${misc:Pre-Depends} Description: Point Cloud Library - search library The Point Cloud Library (PCL) is a standalone, large scale, open project for 2D/3D image and point cloud processing. @@ -273,9 +276,9 @@ Description: Point Cloud Library - search library Package: libpcl-segmentation1.7 Architecture: any Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Pre-Depends: ${misc:Pre-Depends} Description: Point Cloud Library - segmentation library The Point Cloud Library (PCL) is a standalone, large scale, open project for 2D/3D image and point cloud processing. @@ -289,9 +292,9 @@ Description: Point Cloud Library - segmentation library Package: libpcl-surface1.7 Architecture: any Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Pre-Depends: ${misc:Pre-Depends} Description: Point Cloud Library - surface library The Point Cloud Library (PCL) is a standalone, large scale, open project for 2D/3D image and point cloud processing. @@ -305,9 +308,9 @@ Description: Point Cloud Library - surface library Package: libpcl-tracking1.7 Architecture: any Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Pre-Depends: ${misc:Pre-Depends} Description: Point Cloud Library - tracking library The Point Cloud Library (PCL) is a standalone, large scale, open project for 2D/3D image and point cloud processing. @@ -321,9 +324,9 @@ Description: Point Cloud Library - tracking library Package: libpcl-visualization1.7 Architecture: any Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Pre-Depends: ${misc:Pre-Depends} Description: Point Cloud Library - visualization library The Point Cloud Library (PCL) is a standalone, large scale, open project for 2D/3D image and point cloud processing. @@ -338,7 +341,10 @@ Description: Point Cloud Library - visualization library Package: libpcl-outofcore1.7 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends} Description: Point Cloud Library - outofcore library The PCL framework contains numerous state-of-the art algorithms including filtering, feature estimation, surface reconstruction, registration, model @@ -349,7 +355,10 @@ Description: Point Cloud Library - outofcore library Package: libpcl-people1.7 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends} Description: Point Cloud Library - people library The PCL framework contains numerous state-of-the art algorithms including filtering, feature estimation, surface reconstruction, registration, model @@ -360,7 +369,10 @@ Description: Point Cloud Library - people library Package: libpcl-recognition1.7 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends} Description: Point Cloud Library - recognition library The PCL framework contains numerous state-of-the art algorithms including filtering, feature estimation, surface reconstruction, registration, model @@ -371,10 +383,10 @@ Description: Point Cloud Library - recognition library Package: pcl-tools Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, - libpcl1.7 (= ${binary:Version}) +Depends: ${misc:Depends}, + libpcl1.7 (>= ${binary:Version}) Multi-Arch: foreign -Description: Point Cloud Library - point cloud processsing tools +Description: Point Cloud Library - point cloud processing tools The Point Cloud Library (PCL) is a standalone, large scale, open project for 2D/3D image and point cloud processing. . diff --git a/debian/libpcl-doc.lintian-overrides b/debian/libpcl-doc.lintian-overrides index adf469c0..53030d8f 100644 --- a/debian/libpcl-doc.lintian-overrides +++ b/debian/libpcl-doc.lintian-overrides @@ -34,5 +34,5 @@ privacy-breach-generic usr/share/doc/libpcl-doc/html/a02296.html www.pointclouds # this file is licenced under Creative Commons Attribution 3.0. http://creativecommons.org/licenses/by/3.0/ # and it's DFSG compilant. -privacy-breach-logo usr/share/doc/libpcl-doc/html/index.html +privacy-breach-logo usr/share/doc/libpcl-doc/html/index.html (http://www.pointclouds.org/assets/images/contents/logos/pointcloudlibrary_logo.png) diff --git a/debian/rules b/debian/rules index b80384f5..9024585c 100755 --- a/debian/rules +++ b/debian/rules @@ -28,7 +28,8 @@ override_dh_auto_configure: -DBUILD_search=ON -DBUILD_segmentation=ON -DBUILD_surface=ON \ -DBUILD_tools=ON -DBUILD_tracking=ON -DBUILD_visualization=ON \ -DBUILD_apps_cloud_composer=ON -DBUILD_apps_modeler=ON \ - -DBUILD_apps_point_cloud_editor=ON -DBUILD_apps_in_hand_scanner=ON + -DBUILD_apps_point_cloud_editor=ON -DBUILD_apps_in_hand_scanner=ON \ + -DWITH_DOCS=ON override_dh_auto_build: dh_auto_build -- # Compile the software. @@ -53,7 +54,11 @@ override_dh_install: pcl_statistical_multiscale_interest_region_extraction_example \ pcl_registration_visualizer pcl_surfel_smoothing_test \ pcl_timed_trigger_test pcl_viewer pcl_virtual_scanner \ - pcl_voxel_grid_occlusion_estimation; do \ + pcl_voxel_grid_occlusion_estimation pcl_compute_hausdorff \ + pcl_generate pcl_grid_min pcl_in_hand_scanner pcl_local_max \ + pcl_morph pcl_ni_trajkovic pcl_obj2pcd pcl_offline_integration \ + pcl_openni_klt pcl_progressive_morphological_filter \ + pcl_openni_organized_multi_plane_segmentation; do \ cmd="dh_link -p pcl-tools usr/share/man/man1/pcl_pointclouds.1 usr/share/man/man1/$$i.1"; \ echo $$cmd; $$cmd; \ done -- 2.30.2